From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 7 May 2001 13:43:10 +0000 (+0000)
Subject: (delete_kboard): Handle the case that selected_frame
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~40435
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9d40a1392e9d10a9b21bd0260482162285713d17;p=emacs.git

(delete_kboard): Handle the case that selected_frame
has been deleted in the course of x_connection_closed.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index da1ce089b9d..e447211a277 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10032,9 +10032,11 @@ delete_kboard (kb)
   *kbp = kb->next_kboard;
 
   /* Prevent a dangling reference to KB.  */
-  if (kb == current_kboard)
+  if (kb == current_kboard
+      && FRAMEP (selected_frame)
+      && FRAME_LIVE_P (XFRAME (selected_frame)))
     {
-      current_kboard = SELECTED_FRAME ()->kboard;
+      current_kboard = XFRAME (selected_frame)->kboard;
       if (current_kboard == kb)
 	abort ();
     }